Merge fixes...