More appropriate logging controls

This should reflect intended logging controls.