imporvements for sqoop cornercases