Minor static analysis fixes