Switch to 2048-bit ssl keys, reduce anonymous inner classes