Cherry-picking (badly commited) Mike's fix of `all' target
Add timing information