More fixes for BeanStalk

Change-Id: I9270261533b7f67278bda306e5c4188b66adb45c