scrutinizr fixes