Set default site and a couple of other minor fixes comming form testing on MacOS