Fixed everything that blew up...