Better logging, another fix