Fixes for incorrect namespace issues