Fix the problems specified from travis-ci.org