Fix some identification problems