Fix static analysis issues (#2190)