Fix things so that they (hopefully) don't break under latest Q