More modal fixes