Minor changes for HTTPS