Tweaks to make it run on the server (https)