[ticket/289] Add a few more minor scrutinizer fixes

B3P-289