Still some fixes to make Travis-CI work again