Fix static analysis issues (#2193)