Fixed some other broken things