Fixes for ui-Dialog