Fixed additional residual bugs from the namespace addition.