Tried to fix some Eclipse issue