more gtp fixes