More pekwm fixes