Perform Various Fixes

Bench: 7203750