Minor Doran tweaks