GiovanH Rewriting tweaks