Some Chakart fixes/adjustments