Updates from lst pull request.