Fixed up some broken things