Fixes from merge