last bugfixes

Change-Id: I5b4648f6d526f637b9bed1147f3f7be08486c4a0