Updated to build against current interfaces.