More modal improvements