Update main repo with fixes.

Updating main repo with fixes.