Modified two line-search related bugs.