:lipstick: Scrutinizer Fixes