Modifications for Chain Fixes

Modifications for Chain Fixes