Fixes missed in 61adb7d15215bed4d556d15c269eaf347564582c