Fixing controllers for HTTPS.
Merging.