Fixing namespace errors.