[ticket/289] Fix newly added scrutinizer issues