More bug fixes to LFHD