Update for newest Forge.

Some tweaking to several util classes