Fixes to LHN according to bug list.