master fixes