Fix timer issues