Fixes for modal