Some fixes

Change-Id: I01b67be1a85bbe3f263d5745b7a415b2e262c3cd