fixes from previous merge