[MP] Actually fix previous commits.
[SP] Fix compiler warnings
[JK2] Fix compiler warnings
[MP] Fix compiler warnings