Address safety concerns