some fixes to make master branches the same