Fix some bugs
Slightly fix NatAsNumber.mc