Satya - Bug Fixes

L100, Life100