#2264: Some more specs