CS fixes

@keradus Fix this one also :-).