Changes to accomodate eclipse build from source