CLC-859 Misc Livestyle fixes from PR review