Some tweaking of the nameplate code.