Polish on Spring Social/Security code.