Fix IDs and strings