Updates after deprecated APIs removed from Toolkit