Gol attack fixes