Fix Array-Vars Related Problems