Correct hostname and hash handling for #18