various fixes from first test runs

Change-Id: Ifa5a780dc0123aa84273c57c726c8c1bea563495
5 files changed