fixing some durability issues