toString fixes