Bug fixes to make_stimuli