Fixes for W32/OSX

PSP code is untouched, no need to update.