Fix a couple of issues and have more verbose logs