Fixes for BeanStalk

Change-Id: I36a6b774225d6e4c2aa90534c8c0124b1e8a8aee