various changes to resolve API changes