fixing the compile errors from the develop merge