A few small operation fixes