Fixed things that broke during merging