Enhanced logging. refs #449