Fixes for merge