Fixed all id conflicts. The rest are normal 1.7 ready