Bug fixes

Change-Id: I3d05902f430a1b60ec09a0a3315a1878e661e483
Merge "Bug fixes" into production