Fixes to merge problems