minor post merge fixes