Some general cross-qt fixes