Small fixes in CalStruct.