Static analysis cleanups