Resolve travis-ci failures