Fixed some logic relating to host setup and key.