Fixed some errors interrupting parsing