Various dialog cleanup