Small fixes

Some fixes.
That might actually fix #9138.