Duplicated features and fixed them for multi distros