Fixes

Cherry-picking additional fixes