[PATCH] Frame crash and extra minibuffers fixes