Bugfixes

Change-Id: I6e39c2e4abc63d28c11e1912b4ba49405ab40fc6