Fixed some broken things