Fixes from testing

Change-Id: If3b9e98968f417387587a12e36263eb5b6781fca