More fixes. Fixed everything now maybe.