Some fixes

Change-Id: I553fb5dc2c8c3c7a930ab4a38605021c131970f4