fix scrutinez issues