Fix the stuff I just wrote