Make corrections as suggested by @dabit