Minor fixes, typos