Fix more static analysis errors