Attempt to address issues that only seem to appear on Travis