Minor security cleanup