Fixed a few things Max_FF didn't get