Move the add security descriptor code to *after* all the other meta-data is