Fixes from Integration 11-16