Fix more stuff up to use Pattern instead of Image