Further fixes in Trash function