Bug fixes in Timer