Bugfixes in prompt