Fixed some issues left from calc integration