Fixes for Travis... Oops.