Merge fixes 2-5