Match a few more variants