Made some static variables non-static.