Fix up these type macros