Fix for str API changes