Removed a few static analysis bugs.