more trash action fixes