Fixed several issues with prompts