Tweaks to maybe make travis happier