Fixed namespace issues with latest nightly.

Closes #41