Cale fixes. Resolves #115