Some conversion and fixes