Update to use latest Base.jar