Fixed some namespace errors