CRM-14476, case type fixes