Verious bits left over from the namespace conversion