Hopefully fixes Travis build errors