Yet more merge fixes - works for real this time