upstream fixes from any2api