Fixed more toString() fails