Fix dead references
Fix wrong namespace address