[FIX] Various syntax issues