Minor changes to get location and host nodes to work