Fixed some GOF bugs