Minor spec updates
Merge