Dialog and minor fixes