Brian's fixes for rewrites.json