Various updates on comp perf