Multi control fixes with small code changes.

Multi control fixes with small code changes.