Fixing Travis test errors