Fixed timer bugs