fix some inconsistencies