Fix all the stuff I just did