Fixed a few regressions related to my poor code cleanup