tweak a few deprecated variables