post merge fixes from previous merge attempt