Review Request 788: Hardware: Fixed Coverity findings