more cal fixes