[BUGFIX] Fix scrutinizer issues