Updates to get Travis working