minor misc improvement