Fix compiler errors after last framework change