More security compliance modifications