various abbreviation related fixes