And more exception type fixes