Fix minor key and short value inconsistencies