More fixes, but the pattern guard thingy doesn't work.