- coverity based bug fixes - round #1