Cal service fixes