Some more timer modifications