Fixed errors that really shouldn't be happening