fix static analysis defects