Fixed last few broken things