Fix up go routines