Cs fixes

And her is a full package of CS fixes ;)