fixes suggested by eclipse