Security review fixes