more hermit fixes