CS fixes
Translator correctly handle arrays