Bug fix---missing static declaration on some variables.
Bug fix---these two variables are now static.