The rest of the modals fix