Fixes to merge