Some API-change related updates