Some wrong typing chenged