Status bugfixes and other things

Change-Id: I9c5f94c0e583bccd42fb1ea752b9eb1367391f34