(CS) Some minor bugfixes