fix compile errors with latest merge