More Setup to fix new Sponge Calls.