Some calc fixes