Some type changes