CS fixes

@stof: Thank for the report!
@keradus: Fix this one and the PR will be ready to merge :-).