Porting old patches to the NSMB Code Reference