Fixed some compatibility problems with numbers and different ways of evaluating them