Fixing fill in of types in local and global assignments