Merge pull request #630 from jSTE0/fix-spu-defaults