more post merge fixes