fixes from merge issues