Fixed broken things