More doc fixes
Fix the way we do rewrites