Fixed dialog message and some dependencies