Minor changes to analysis modules for labeling