Additional tf import interface fixes

Better checks for tf file