* Another small batch of fixes from static analysis tool.