Some fixed for element errors.