Update Forge
Prevent fields access, cleaned some code