A few more prompt tweaks