fixes to merge