Two bugfixes needed to make multiple operations work (eg 1+2+3).