Fixes to get Travis working