Fix boundary object and string cases