GenericUnit fixes