CS fixes (manual)