Fixed conversion mistakes