Fixes for merge issues