Fix few broken things