More fixes to ensure that https-based access doesn't throw a warning.