Start adapting to recent server-side changes