Further changes to duration handling