Fix some inconsistencies.