More spec corrections