Small fixes to get it compiling with ARMCC. I have no idea why category_t was in the enum definition for qstrs...