changes to compile beanstalk

Change-Id: I2317d304a02afc0db4ada179b6da402087b502a7