[ticket/11] Fix scrutinizer issues