More fixes for slave build.