Fix for Travis issues