More fixes for master