Minor fixes from static analysis.