added some master fixes