fix several compile errors from remapping