LOF misc fixes. #2033