[WIP] Timer fixes