Ugly fixes to some Attribute routing funnies