Timer improvements and bootstrap