Fixed problems caused by eclipse upgrade