Ticket #1566: Improvements suggested by Ark