Fixed some namespace resolution problems