Use the correct separators and add fix option