Fix compiler error and update forge
Oh god why immutable collections for this