Fixed bugs associated with typos/missing ';'