CS fixes + small fixes