Bug fixes in prompt