Made some static fields non-static.