Fix for missing imports for new nightly build