Small fixes for the trash