Fixes in commit 59dfa9cfdf7d95b587dcfa759fab330c94151eaa

Change-Id: I46ab4ef0f493725ef25c3b5ecfcce1b66addc95f