PR-180 updates following travis job failures