Fixed minor bugs due to the namespace feature implementation.