Adding fixes for the travis-ci testing issue