Fixed a few errors from untested commit