Improved logging + increased max wait time for confirmation dialog