Fixes to resolve merge problems