Fixed several types