Some extra logging and debug