More work on fixing headless grader