A couple more snippet changes