Fixes for Travis...