Don't use logical abbr
Minor fixes