Fixes bug in abbreviations. Fixes bug with integers in YAML.