Small bug fixes in CalStruct.