Update code with changes made while 4.5.20 was pending