Fixes for Travis