Saleblazers: Small Stability Patch

Hello shopkeepers! This is another small stability patch to fix a few bugs and clean up some minor issues. We're hard at work on the next major patch, but we wanted to get these fixes out to you to improve your experien…