Tweak gate, potentially fix major issues