Corrections for errors that caused ICE in 4.7.2