Changes to support eclipse.