Minor updates to have a better debug