some fixes

Change-Id: Ie43b35be21b75005a7aecb0b15536ee9f4f662e0