Fixes related to merge