Fix bevry/projectz#49 and bevry/projectz#45