Added possible fixes for the build failures detected by travis-ci.