Fixing static definitions to private for 3.1 compatibility