Eliminate conversion mistakes