minor fixes from merge