More fixes for continous builds.