Fix minor kibit warnings