more logging changes, use common package