Import and type fixes. Now builds on linux/Clang.