Duration fixes/additions