Fix handling of sensitive information