fixes for upstream API changes