Further PAL fixes