Dialog box fixes