Minor tweaks. Fixed another namespace.