Adjustments to make up for API changes