Additional bug fixes with upload matcher.