Tweaked logging for datasource