Fixes for bugs preventing removal reports