Fixes for merge bugs