Try fixing travis test failures

Ref #1017