a few tweaks for some changes to the code base