Fixed things that broke from last commit