Fixes to trash and selection