Some small fixes

One is quite benign but my git setup kept complaining so here a patch for the endline =)

The other is a backport from the javascript parser. I tested it and should work as intended.