#1365 moar case type fixes