Misc fixes -- Fix misc static analyzer issues.