Small fixes (Syntax error + CS fixes)