Some fixes to calc interface and project.