Fix staticity of some fields and methods.