Dialog box fixes + logging cleanup.