Fixed minor issues. (e.g. short name on [] case.)