Fix even more Eclipse errors