IM: Fixed things that the last commit broke