SPG fixes!