(PSP) small fixes