Small refactorings to make jenkins happier #2