Small fixes, typos etc.

@jhlch.