futher merge fixes