Fix bugs introduced by the nonexistant GID support change