Fixes for travis test