Fixed some old stim bugs