Several small fixes, alias, typo