Improves several specs