Updating with bugfixes

Change-Id: I95550dceba63ae4b14fd9a93bf5127d4749035c0