Fixes to Cale