Fixed none string issues