even more fixes for the merge