more kalibrate fixes