Fixes for local merge