Cleanup compile time errors, more attempting to fix runtime errors in ASMRegistry.