Remove useless protection
Improve estimated timer for short durations
Merge branch 'marcandre-estimate'