More spg fixes