wato_import: little improvments