Fixing more typos per feedback from Viliam