Bugfixes

Change-Id: I50b9521d21dcb93e3134888b7f95a1abba36da5f