Warning fix and lib update
Conversion cleanup and some utils