Couple more security demand logging changes