More prompt fixes