Fixes

Fixes #127 (closed) and fixes #128 (closed) (or at least I'm pretty sure it does). This is another case of "I don't know why this didn't produce errors literally every single time backwards compatibility was run."