Correcting some matchCase stuff