Minor bug fixes. Problems with dotted numeric