Eclipse build fixes