Some fixes

Hope this helps with #7255.
It should be easier to fix now anyway.
My text-editors automatically removes trailing spaces, sorry about that. :)