1) Should have thought about that, thanks !

2) Agreed about the magic number, as said in initial PR. What could we do about it ? Move this constant and possibly others out of main.h to a new header file, which could then be used there, here, and in bitcoinrpc.cpp where the same magic number is also used ?