Dialog and settings fixes