Correction of conversion warnings, formatting