Starting on file-specific fixes.