MOAR fixes with ROM version