Minor changes for tagging and processing.