Fix scrutinizr issues