fixes from merge