Change security classes to compile against modified security API's