Even more fixes

Change-Id: Iaa39dd043ee42fae3ba88ec06eb2f071961c8260