Added more verbose logging
Fixes