Fix issues in 1.9.1 spec based on the 1.8.0 spec