fix compile errors caused by recent merge