Other CS fixes