SRM-520: two problems resolved