Some bigfuxes to match travis-ci tests