Bugfixes for the plain text parser