Smaller fixes and Lighthouse optimizations

[Bohreromir]

Smaller fixes and improvements I found along the way as well as lighthouse improvements to 100🎉

As this is a lot of small stuff its probably easier to review the independent commits separate from each other in this pr.

[stackable-cla]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}