more small fixes for desktop_image http/https support