Fix things and stuff