Fixed calc and log classes