Various fixes for the continuous build