Fix and refactor numeric fields