even more parse error fixes