* Some more static analysis issues fixed.