Added timer fixes

closes #1