Fix kibit & bikeshed issues