Fixes from downstream merge