various fixes at parser