Fixes for travis