Fix string/integer subtraction