Fixes to bad merge