Updated references to latest versions