[SP] A fair amount of warning cleanup for SP and JK2SP.
[MP] Minor cleanup