Timer final bugfixes