Fix some of the broken things