Remove more deprecated API warnings