Different small fixes, typos etc