Fixes and timer update optimization