Fixing further SS 3.1 compatibility issues

Fixing a few more statics for 3.1 compatibility.