Fixes for travisCI