SSL and Unicorn additions