Some fixes for clean Travis builds