Type system fixes.