Static analysis fixes.