Fixed sub instruction and cpu enumerations