Adapt Code Fixes.