Minor changes, improve logging messages to help with debug