bug fixes against scrutinizr new settings