Minor tweaks to behaivior