jh - more merge fixes