Some small fixes to get around a silly naming convention