bugfixes

Change-Id: I749aaddc2ec6b87f008b5230ba757bf31cbb26f4