Scrutinizr fixes