Clean up specs
CS fixes