Misc bugfixes

Running into issues as I'm adding mods to the repo. Here's the first set of bugfixes for bugs I've uncovered. I'll likely run into more later.