Fixing further statics for 3.1 compatibility