minor changes to security classes