Update to compile against newer Base.jar