More qupgrade fixes