merge minor fixes from pcsxr