fixes from previous merge conflict