Doing the fix for these files properly now