Rewrite some things