Fixes after cherry-picking