Core: CS fixes + cleanup