Fixes compilation and deployment issues after porting to eclipse