fix compile errors in develop branch