Some more tweaks on rereading