Add a few fixes to PSR-0 translation

@timglabisch

If you're fine with that, I'll just add a few fixes. Feel free to cherry-pick, if you like. I'll give you a :+1: as soon as I'm done.