Fix everything now that I could test