Fixed conversion errorrs