few fixes from merge