Fixing broken things (hopefully)