Merge  fixes