Code analysis fixes - ToString and Parse