Some more Modal fixes.