Fixed a couple errors from the refactor