Fix issues with type abbreviations

Close #730.
Close #733.
Merge pull request #734 from dungpa/abbrev-types

Fix issues with type abbreviations