Fixes for travis eyerover