2.0-unstable7 type fixes