Tons o fixes