Fixes for merging