gtp: some regex fixes