Fix a couple of things to stick to the spec more closely