Add logging to r10788 and fix timer setup (nw)