some minor tweaks
Merge pull request #1 from evildmp/ticket_20786

some minor tweaks