Misc CAL fixes