Cleared up some errors from changes