Fix careless errors, stable for four ops