Fix some namespace issu