fix a few static analysis errors (not all)