Minor bugfixes

Please review & pull
I think we can leave out the PPC xfails for now. In case someone picks up PPC, they can add fresh ones then.