Updates to work with recent API revisions