Fixes from Erik

Change-Id: I99b1f0f9970c79b82dbf9ba0d417776f4909824d