Still fighting random failures on travis