Modal fixes