fixes to 502 and systemNumber