Small fix of errors left during conversion time