Repeated fixes for Travis testing