Fixing package references and API versions.