Corrected few conversion issues