Fix a couple of singleton variable warnings