Kibit fixes