Cleanup numeric

Some tiny fixes.