Re-adjust some files to sync with latest linux sources