Small changes to the security server module