fix compile errors from previous commits