Start fixing modals