duration issues fixes