Moar CS fixes