Minor Unicalc Changes