Some type system changes