SPU Fixes 3.1

Small fixes