[MP/SP] Code maintenance