Some master fixes