Fix some state issues with BOSH
3.2.2