Fix pick errors