More PSP fixes.