Fix up long conversion, check single int conversion