Fixes some toString issues