various fixes

Change-Id: I095a1af10a0977b0f05891ca35224b5b4ba1df34