remainder of changes for travis-ci build passing