Fixed the broken things