Fixes from final review