Fixed some residual bugs from the namespace addition.