Make a couple of tweaks to Event Queue.
Merge branch 'laurenbee-master'