Fixed bugs in glue2 parsing