Some more master changes