more changes to address travis build failures