Some small CS changes
Bugfix