Got rid of random wrong types