more master fixes