some fixes

Change-Id: Ifcd2e218f3b6864c28112b4f5b32c4fa46397233