Fixing static reference issues.