Small fixes (Syntax error + CS fixes)
(cherry picked from commit 0425731)
(cherry picked from commit c20e8ff)