Fix a couple of omissions and mistakes