CS fixes on specs