Fixed namespace issues with lates nightly.