Fixes for travis ci