small fixes

I could easily clean up *parts a lot, but that'd mean a map change because of changed paths :(