Fixes for numeric names