and more pwrscale fixes