Fix for some type management problems