Misc bug fixes to make the SheriffBot actually work
Created attachment 51140 [details] Patch
Eric reviewed this in person and I landed it.