Fix some broken things