Fix typos and others