Quick hack/fix to make compile under new Base.jar