Make fit for RC1: finsih all dialogs