Latest master fixes