Add: minor improvements to the string handling;
Fix: some function calls with changed API.