Fixed conversion functions