Fixes for serial merge