More PSP compilation fixes