Updates for static analysis from Scott