Fix typos and errors (Erwin Smout)