revert log sources, fix some warnings