update to build with Nightly

hi,
I've updated a few pieces of code to reflect the changes in nightly builds.