Fix corrections suggested by @derdon