Please review: Ticket #161 - Review and address latest Coverity issues