More hacks just to get Travis working...