Fixing minor namespace problems