Fixed issues with Eclipse Indigo 3.7