Code Affinity Fixes

Code Fixes