minor tweaks to recent API changes.