:lipstick: Scrutinizer patches
:lipstick: fix other stuff suggested by scrutinizer