Fixes for dialog buttons