Fix static anlaysis issues