Fix up --cal handling