fixed some namespace errors