Fix Eclipse Problem findings