Fixes to Duration. Should fix issue #145.