Fix some potential crashes in progress & duration