Improve static references
Merge pull request #54 from fluxroot/2.2.x-replace-static-references

Improve static references