Bit more for #42, better logging