Compute fixes