More fixes for #1329026