Fixed build errors on FreeBSD (and presumably OSX)
Fixed remaining failing parser tests