fixes to master

Change-Id: I03d7d3a913e03cb7dac84591761e15aaf9b157bd