klocwork fixes