Small fixes for developing data import